resolve: Pre-compute non-reexport module children #110160

petrochenkov · 2023-04-10T21:24:13Z

Instead of repeating the same logic by walking HIR during metadata encoding.

The only difference is that we are no longer encoding macro_rules items, but we never currently need them as a part of this list. They can be encoded separately if this need ever arises.

module_reexports is also un-querified, because I don't see any reasons to make it a query, only overhead.

rustbot · 2023-04-10T21:24:20Z

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

petrochenkov · 2023-04-10T21:24:44Z

@bors try @rust-timer queue

bors · 2023-04-10T21:24:55Z

⌛ Trying commit 7f89194ea8ce4ab3b7a465d1caed926a489e8601 with merge ae0a3ff508bc3d46b096586d3b5848bd746e5c1c...

compiler/rustc_resolve/src/imports.rs

bors · 2023-04-10T23:08:13Z

☀️ Try build successful - checks-actions
Build commit: ae0a3ff508bc3d46b096586d3b5848bd746e5c1c (ae0a3ff508bc3d46b096586d3b5848bd746e5c1c)

rust-timer · 2023-04-11T00:22:46Z

Finished benchmarking commit (ae0a3ff508bc3d46b096586d3b5848bd746e5c1c): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.9%	[-1.4%, -0.3%]	19
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.9%	[-1.4%, -0.3%]	19

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.0%	[0.7%, 1.3%]	4
Regressions ❌ (secondary)	2.1%	[1.5%, 2.5%]	3
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-4.3%	[-7.1%, -1.5%]	2
All ❌✅ (primary)	0.7%	[-0.7%, 1.3%]	5

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.8%, -0.4%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.6%	[-0.8%, -0.4%]	4

rustbot · 2023-04-11T15:20:52Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

petrochenkov · 2023-04-11T15:22:04Z

@rustbot ready

compiler/rustc_middle/src/ty/context.rs

cjgillot · 2023-04-11T19:33:23Z

compiler/rustc_resolve/src/imports.rs

+                let res = binding.res().expect_non_local();
+                if !binding.is_import() {
+                    non_reexports.push(res.def_id().expect_local());
+                } else if res != def::Res::Err && !binding.is_ambiguity() {


For Res::Err and ambiguities, should this closure just be a no-op?

Yes, those are effectively imports that import nothing, at least from other crates' points of view.
(Although for ambiguities it's an open question - #36837.)

Instead of repeating the same logic by walking HIR during metadata encoding. The only difference is that we are no longer encoding `macro_rules` items, but we never currently need them as a part of this list. They can be encoded separately if this need ever arises. `module_reexports` is also un-querified, because I don't see any reasons to make it a query, only overhead.

petrochenkov · 2023-04-12T13:10:05Z

@rustbot ready

compiler-errors · 2023-04-12T19:03:53Z

r? @cjgillot

cjgillot · 2023-04-13T14:46:15Z

@bors r+

bors · 2023-04-13T14:46:19Z

📌 Commit 7c40a6f has been approved by cjgillot

It is now in the queue for this repository.

bors · 2023-04-14T01:14:40Z

⌛ Testing commit 7c40a6f with merge 7a78c4f...

bors · 2023-04-14T03:30:17Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 7a78c4f to master...

rust-timer · 2023-04-14T18:07:23Z

Finished benchmarking commit (7a78c4f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.8%	[-1.5%, -0.2%]	26
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-0.8%	[-1.5%, -0.2%]	26

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.8%	[2.0%, 4.2%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

resolve: Pre-compute non-reexport module children Instead of repeating the same logic by walking HIR during metadata encoding. The only difference is that we are no longer encoding `macro_rules` items, but we never currently need them as a part of this list. They can be encoded separately if this need ever arises. `module_reexports` is also un-querified, because I don't see any reasons to make it a query, only overhead.

rustbot assigned compiler-errors Apr 10, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 10, 2023

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 10, 2023

petrochenkov mentioned this pull request Apr 10, 2023

rustc_metadata: Remove Span from ModChild #109772

Merged

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2023

petrochenkov commented Apr 10, 2023

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 11, 2023

This comment was marked as resolved.

Sign in to view

petrochenkov force-pushed the notagain2 branch from 7f89194 to c3c4e6e Compare April 11, 2023 15:20

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 11, 2023

cjgillot reviewed Apr 11, 2023

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2023

petrochenkov force-pushed the notagain2 branch from c3c4e6e to 7c40a6f Compare April 12, 2023 13:08

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2023

rustbot assigned cjgillot and unassigned compiler-errors Apr 12, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 13, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2023

bors merged commit 7a78c4f into rust-lang:master Apr 14, 2023

rustbot added this to the 1.70.0 milestone Apr 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resolve: Pre-compute non-reexport module children #110160

resolve: Pre-compute non-reexport module children #110160

petrochenkov commented Apr 10, 2023

rustbot commented Apr 10, 2023

petrochenkov commented Apr 10, 2023

This comment has been minimized.

bors commented Apr 10, 2023

bors commented Apr 10, 2023

This comment has been minimized.

rust-timer commented Apr 11, 2023

This comment was marked as resolved.

This comment was marked as resolved.

rustbot commented Apr 11, 2023

petrochenkov commented Apr 11, 2023

cjgillot Apr 11, 2023

petrochenkov Apr 11, 2023

petrochenkov commented Apr 12, 2023

compiler-errors commented Apr 12, 2023

cjgillot commented Apr 13, 2023

bors commented Apr 13, 2023

bors commented Apr 14, 2023

bors commented Apr 14, 2023

rust-timer commented Apr 14, 2023

resolve: Pre-compute non-reexport module children #110160

resolve: Pre-compute non-reexport module children #110160

Conversation

petrochenkov commented Apr 10, 2023

rustbot commented Apr 10, 2023

petrochenkov commented Apr 10, 2023

This comment has been minimized.

bors commented Apr 10, 2023

bors commented Apr 10, 2023

This comment has been minimized.

rust-timer commented Apr 11, 2023

Overall result: ✅ improvements - no action needed

This comment was marked as resolved.

This comment was marked as resolved.

rustbot commented Apr 11, 2023

petrochenkov commented Apr 11, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

petrochenkov commented Apr 12, 2023

compiler-errors commented Apr 12, 2023

cjgillot commented Apr 13, 2023

bors commented Apr 13, 2023

bors commented Apr 14, 2023

bors commented Apr 14, 2023

rust-timer commented Apr 14, 2023

Overall result: ✅ improvements - no action needed